Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix setupDev logic in rootfs_linux.go #742

Merged
merged 1 commit into from Apr 11, 2016

Conversation

LK4D4
Copy link
Contributor

@LK4D4 LK4D4 commented Apr 11, 2016

setupDev was introduced in #96, but broken since #536 because spec 0.3.0 introduced default devices.

Fix #80 again
Fix moby/moby#21808

This is carry of #732, so Closes #732
ping @mrunalp @cpuguy83 @crosbymichael

@mrunalp
Copy link
Contributor

mrunalp commented Apr 11, 2016

LGTM

@cpuguy83
Copy link
Contributor

libcontainer/rootfs_linux_test.go:53: assignment count mismatch: 2 = 1
libcontainer/rootfs_linux_test.go:72: assignment count mismatch: 2 = 1
libcontainer/rootfs_linux_test.go:91: assignment count mismatch: 2 = 1
libcontainer/rootfs_linux_test.go:110: assignment count mismatch: 2 = 1

},
},
}
setupDev, err := needsSetupDev(config)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No err returned from the function.

setupDev was introduced in opencontainers#96, but broken since opencontainers#536 because spec 0.3.0 introduced default devices.

Fix opencontainers#80 again
Fix moby/moby#21808

Signed-off-by: Akihiro Suda <suda.kyoto@gmail.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
@LK4D4
Copy link
Contributor Author

LK4D4 commented Apr 11, 2016

@cpuguy83 @mrunalp fixed, sorry for that

@cpuguy83
Copy link
Contributor

IANTM but LGTM

@mrunalp
Copy link
Contributor

mrunalp commented Apr 11, 2016

LGTM

1 similar comment
@crosbymichael
Copy link
Member

LGTM

@crosbymichael crosbymichael merged commit f54e41f into opencontainers:master Apr 11, 2016
@LK4D4 LK4D4 deleted the carry_732 branch April 11, 2016 18:16
@AkihiroSuda
Copy link
Member

@LK4D4 Thank you a lot for carrying this, and sorry for my delay!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants